From 8e9d5b5bd2a9141898257e84ca6d8c1a6f0f5fe4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 22 Jul 2015 14:35:06 -0700 Subject: [PATCH] etc: Fix merging distributions on Windows The rustlib folder is in `bin` on Windows, not in `lib`. --- src/etc/install-deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/etc/install-deps.py b/src/etc/install-deps.py index c5be017fe..9bd7a46c9 100644 --- a/src/etc/install-deps.py +++ b/src/etc/install-deps.py @@ -15,6 +15,7 @@ else: extra_bits = 'i686' extra = None +libdir = 'lib' # Figure out our target triple if sys.platform == 'linux' or sys.platform == 'linux2': @@ -24,6 +25,7 @@ elif sys.platform == 'darwin': host = host_bits + '-apple-darwin' extra = extra_bits + '-apple-darwin' elif sys.platform == 'win32': + libdir = 'bin' if os.environ.get('MSVC') == '1': host = host_bits + '-pc-windows-msvc' else: @@ -51,7 +53,7 @@ def install_via_tarballs(): folder = extra_fname.replace(".tar.gz", "") with contextlib.closing(tarfile.open(extra_fname)) as tar: for p in tar.getnames(): - if not "rustc/lib/rustlib/" + extra in p: + if not "rustc/" + libdir + "/rustlib/" + extra in p: continue name = p.replace(folder + "/", "", 1) dst = "rustc-install/" + name -- 2.30.2